From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sun, 18 Aug 2013 18:16:49 +0000 (+0200)
Subject: network: don't crash because a device doesn't have a description yet
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3571
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f7284caefd9b344122892bb707ceb7125249cf1a;p=gnome-shell.git

network: don't crash because a device doesn't have a description yet

Descriptions are only added after all devices are read (thanks
to the disambiguation in libnm-gtk), but we use them immediately
when we call _sync() in various points (such as checkConnection())

https://bugzilla.gnome.org/show_bug.cgi?id=706262
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index e78610532..e751980c6 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -182,7 +182,14 @@ const NMConnectionSection = new Lang.Class({
 
         this.item.status.text = this._getStatus();
         this.item.icon.icon_name = this._getMenuIcon();
-        this.item.label.text = this._getDescription();
+
+        // desc can be undefined at cold-plug, before we called
+        // NMGtk.disambiguate_device_names() at least once
+        let desc = this._getDescription();
+        if (desc)
+            this.item.label.text = desc;
+        else
+            this.item.label.text = '';
     },
 
     _getStatus: function() {